Skip to content

refactor: check onboarding company size instead of asserting it - #106381

Merged
blimpich merged 2 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt-v2/batch-20261023-804bc132-run-1-284f64d4-company-size
Nov 11, 2026
Merged

blimpich merged 2 commits into
Expensify:mainfrom
KJ21-ENG:seatbelt-v2/batch-20261023-804bc132-run-1-284f64d4-company-size

Conversation

@KJ21-ENG

@KJ21-ENG KJ21-ENG commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Remove the four introSelected?.companySize as OnboardingCompanySize casts. IntroSelected.companySize is server data stored as a plain string, so the cast claimed a type that nothing checked.

The new getIntroSelectedCompanySize helper returns the saved value only when it is one of CONST.ONBOARDING_COMPANY_SIZE, current or legacy. The invoice-payment onboarding (PayMoneyRequest), workspace creation (buildPolicyData) and guided setup for invited users (getGuidedSetupDataForOpenReport) now use it. Known values are sent exactly as before. An unknown or empty value is no longer sent as onboardingCompanySize.

This was split out of #104927 after review, because it needs this runtime check. The code is the same as the companySize part of that PR, plus the check.

Changed files:

  • src/libs/actions/Welcome/OnboardingFlow.ts
  • src/libs/actions/IOU/PayMoneyRequest.ts
  • src/libs/actions/Policy/Policy.ts
  • src/libs/actions/Report/index.ts
  • tests/unit/OnboardingFlowTest.ts

Fixed Issues

$ #94739
PROPOSAL: #94739 (comment)

Tests

Unit tests cover this change, as they did when it was part of #104927. No manual case is added, for two reasons:

  • A known company size, current or legacy, is sent exactly as before. The onboarding picker only offers known sizes, so every normal user flow sends the same value as on main.
  • An unknown or empty saved value is the only changed case. The UI cannot create it, so a manual step cannot reach it.

OnboardingFlowTest checks that current and legacy sizes are kept and that an unknown, empty or missing value gives no company size. PayMoneyRequestTest, PolicyTest and ReportTest run the invoice payment, workspace creation and guided setup paths that use the helper.

To repeat the selected suites with the normal repository test command:

npm test -- --runInBand --runTestsByPath \
  tests/unit/OnboardingFlowTest.ts \
  tests/actions/IOUTest/PayMoneyRequestTest.ts \
  tests/actions/PolicyTest.ts \
  tests/actions/ReportTest.ts \
  tests/actions/IOUTest/TrackExpenseTest.ts

Offline tests

N/A. Only the value passed into the existing onboarding data changes. Request queuing and offline behavior are unchanged.

QA Steps

N/A. No user-visible behavior changes for any value the App can create. The unit tests above cover the changed case.

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

N/A. No UI or user-visible behavior changes.

IntroSelected.companySize is a plain string from the server. Return it only when it is a known
CONST.ONBOARDING_COMPANY_SIZE value, current or legacy, instead of casting it at four call sites.
KJ21-ENG added a commit to KJ21-ENG/App that referenced this pull request Nov 9, 2026
…company size

Address review: getCountryCode has one signature that looks the value up in CONST.ALL_COUNTRIES
and returns undefined for an unknown value, and normalizeCountryCode is one generic function, so the
overloads, IntlStore.get overloads and translateCountry are gone. The chart change is left to Expensify#100148
and the companySize change moved to Expensify#106381. Tests now cover only the changed country behaviour.
@KJ21-ENG
KJ21-ENG marked this pull request as ready for review November 11, 2026 10:03
@KJ21-ENG
KJ21-ENG requested review from a team as code owners November 11, 2026 10:03
@KJ21-ENG

Copy link
Copy Markdown
Contributor Author

@situchan This is the companySize change split out of #104927, as discussed there. It adds the runtime check you asked for. Please review when you get a chance.

@melvin-bot
melvin-bot Bot requested review from situchan and removed request for a team November 11, 2026 10:03
@melvin-bot

melvin-bot Bot commented Nov 11, 2026

Copy link
Copy Markdown

@situchan Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot requested review from dylanexpensify and removed request for a team November 11, 2026 10:04
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 11, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-11T10:17:55.483058Z a261657 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@situchan

situchan commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@melvin-bot
melvin-bot Bot requested a review from blimpich November 11, 2026 10:26

@dylanexpensify dylanexpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Product input not required for this PR.

@blimpich blimpich left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

– written by Claude on Ben's behalf

@blimpich
blimpich merged commit 01e3110 into Expensify:main Nov 11, 2026
45 of 49 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 blimpich has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/blimpich in version: 9.5.37-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR validates saved company-size data without changing normal user workflows or making any existing article instructions incorrect.


view run

@izarutskaya

Copy link
Copy Markdown

@KJ21-ENG Ok to check this off the list?

N/A. No user-visible behavior changes for any value the App can create. The unit tests above cover the changed case.

@KJ21-ENG

Copy link
Copy Markdown
Contributor Author

@izarutskaya Yes, ok to check off.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.5.37-1 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 iOS 🍎 failure ❌

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants